From 21d8160c57fc464e123a2ba08ef049a33d2eade9 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 21 Dec 2010 02:05:12 +0100 Subject: [PATCH] x11: Export GdkX11Cursor --- gdk/x11/gdkcursor-x11.c | 10 ---------- gdk/x11/gdkx11cursor.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c index d9ec9329ea..013db3cba3 100644 --- a/gdk/x11/gdkcursor-x11.c +++ b/gdk/x11/gdkcursor-x11.c @@ -46,16 +46,6 @@ #include #include -#define GDK_TYPE_X11_CURSOR (gdk_x11_cursor_get_type ()) -#define GDK_X11_CURSOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_CURSOR, GdkX11Cursor)) -#define GDK_X11_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_CURSOR, GdkX11CursorClass)) -#define GDK_IS_X11_CURSOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_CURSOR)) -#define GDK_IS_X11_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_CURSOR)) -#define GDK_X11_CURSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_CURSOR, GdkX11CursorClass)) - -typedef struct _GdkX11Cursor GdkX11Cursor; -typedef struct _GdkX11CursorClass GdkX11CursorClass; - struct _GdkX11Cursor { GdkCursor cursor; diff --git a/gdk/x11/gdkx11cursor.h b/gdk/x11/gdkx11cursor.h index e0169baada..a4647c9096 100644 --- a/gdk/x11/gdkx11cursor.h +++ b/gdk/x11/gdkx11cursor.h @@ -38,6 +38,22 @@ G_BEGIN_DECLS +#define GDK_TYPE_X11_CURSOR (gdk_x11_cursor_get_type ()) +#define GDK_X11_CURSOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_CURSOR, GdkX11Cursor)) +#define GDK_X11_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_CURSOR, GdkX11CursorClass)) +#define GDK_IS_X11_CURSOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_CURSOR)) +#define GDK_IS_X11_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_CURSOR)) +#define GDK_X11_CURSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_CURSOR, GdkX11CursorClass)) + +#ifdef GDK_COMPILATION +typedef struct _GdkX11Cursor GdkX11Cursor; +#else +typedef GdkCursor GdkX11Cursor; +#endif +typedef struct _GdkX11CursorClass GdkX11CursorClass; + +GType gdk_x11_cursor_get_type (void); + Display *gdk_x11_cursor_get_xdisplay (GdkCursor *cursor); Cursor gdk_x11_cursor_get_xcursor (GdkCursor *cursor); -- 2.30.2